Revert "HID: core: store the unique system identifier in hid_device"
This reverts commit 52badc06b119da3c559a4b835334cc70d4561b4b which is
commit 1e839143d674603b0bbbc4c513bca35404967dbc upstream.
It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.
Bug: 161946584
Change-Id: I1c9b7949853c19e46c3dc125d8e9d7ca15ada746
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 8b300f7..c003219 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -2443,12 +2443,10 @@
hid_warn(hdev, "bad device descriptor (%d)\n", ret);
}
- hdev->id = atomic_inc_return(&id);
-
/* XXX hack, any other cleaner solution after the driver core
* is converted to allow more than 20 bytes as the device name? */
dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
- hdev->vendor, hdev->product, hdev->id);
+ hdev->vendor, hdev->product, atomic_inc_return(&id));
hid_debug_register(hdev, dev_name(&hdev->dev));
ret = device_add(&hdev->dev);
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 189d730..92965bc 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -632,8 +632,6 @@
spinlock_t debug_list_lock;
wait_queue_head_t debug_wait;
- unsigned int id; /* system unique id */
-
ANDROID_KABI_USE(1, struct { u32 initial_quirks; u32 padding; });
ANDROID_KABI_RESERVE(2);
};
